--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 04908eb45b2da76b5045cfad6ca267fd23def87f
Changes
3 files changed, 7 insertions(+), 13 deletions(-)
Diff
diff --git a/sbapp/main.py b/sbapp/main.py
index e98400b8..4b8871fc 100644
--- a/sbapp/main.py
+++ b/sbapp/main.py
@@ -2872,7 +2872,7 @@ class SidebandApp(MDApp):
else:
self.messages_view.ids.messages_scrollview.dest_known = False
if self.messages_view.ids.nokeys_text.text == "":
- keys_str = "The crytographic keys for the destination address are unknown at this time. You can wait for an announce to arrive, or query the network for the necessary keys."
+ keys_str = "The cryptographic keys for the destination address are unknown at this time. You can wait for an announce to arrive, or query the network for the necessary keys."
self.messages_view.ids.nokeys_text.text = keys_str
self.widget_hide(self.messages_view.ids.message_input_part, True)
self.widget_hide(self.messages_view.ids.message_ptt, True)
diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py
index 0b7d4db8..c0d8bbce 100644
--- a/sbapp/sideband/core.py
+++ b/sbapp/sideband/core.py
@@ -957,10 +957,8 @@ class SidebandCore():
def log_announce(self, dest, app_data, dest_type, stamp_cost=None, link_stats=None):
try:
- if app_data == None:
- app_data = b""
- if type(app_data) != bytes:
- app_data = msgpack.packb([app_data, stamp_cost])
+ if app_data == None: app_data = b""
+ if type(app_data) != bytes: app_data = msgpack.packb([app_data, stamp_cost])
RNS.log("Received "+str(dest_type)+" announce for "+RNS.prettyhexrep(dest), RNS.LOG_DEBUG)
self._db_save_announce(dest, app_data, dest_type, link_stats)
self.setstate("app.flags.new_announces", True)
@@ -3418,14 +3416,10 @@ class SidebandCore():
def is_known(self, dest_hash):
try:
source_identity = RNS.Identity.recall(dest_hash)
+ if source_identity: return True
+ else: return False
- if source_identity:
- return True
- else:
- return False
-
- except Exception as e:
- return False
+ except Exception as e: return False
def request_key(self, dest_hash):
try:
diff --git a/setup.py b/setup.py
index 4db951ea..69e60222 100644
--- a/setup.py
+++ b/setup.py
@@ -114,7 +114,7 @@ setuptools.setup(
]
},
install_requires=[
- "rns>=1.1.7",
+ "rns>=1.1.8",
"lxmf>=0.9.5",
"lxst>=0.4.6",
"kivy>=2.3.0",
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────